issue 545 and 1013

this fixes the default images not being cleared