this fixes #357