Fixes #1498