Fixes #1392