Patch 3

See comments on #149.