Fixes #1415