Fixes #1404