Fixed issue #479 (VS2012 only)