Fixes #982 - Tests needed!