Fix GRIFFON-614