Fixes #1234 - what an issue number to have!