Fixed regression in dev branch after 769cc90