Fixes #260 as discussed - easier to merge this pull than two pull
requests