Quickfix for #89 - might need some extra tweaking though

... but this should do for the time being.