Fixes #1502