+ Fixed also for VS 2012