Facing bug fix