Fixes #1030