Fixes #1400