Fixes #1667