Fixes #1508