Fixes #1483