Fix GRIFFON-632