this fixes #400