Fixed misalignment caused by DMW