this fixes #356