Fix dwcheck