Fixes #185

Not really sure if we should be fixing at a deeper level, or is this ok for now? @dodo - as you made the test pull earlier?