Fixes #1394