this fixes #309