fixes #1536