Now works in beta7