Fixes issue #318
Housekeeping