this fixes #316