Implemented in latest version of Lavender