This was fixed during unstable refactoring. Fixes #585