speed! fixes #41