this fixes #191 completely