Fixes #1510