Fixes #1407