fixes #157 sort of