this fixes #321