this fixes #336