Fixes #1482