Added VC++ compatibility