Fixes #1324