this fixes #31/#issuecomment-61376018