fixes #1560
fixes #1593