fixes #395
fixes #395