this fixes #188 completely