Fixes #1192 - Tests needed!