Fix #55
Tweak fix for #55

Not sure this is like /really/ better, but I got slightly distracted
by seeing the flatmap inside the for-comprehension.
Merge branch 'issue-55'