Another fix for VC++