fixes #1541