Added M$ hack