Fixes #1389