Fixes #1592