this fixes #37 completely