Fixes issue GRIFFON-593