Fixes #1440