changed to strict face handling