Fix for #299

Went for option 1. But let me know if you don't think that's correct.