Fixes #1437