Fixes #1385