refs #134, refs #137 - add test case from @smuuf