for review by BR

@rakitzis Could you approve this fix?
This is covered in some detail in #2.