now works on vs2012