Fixes #1559