this fixes #44 completely