Fixes #1200 - Needs tests!