Fixes #1447 - Needs tests