Fix DOF issue