Fixed issue in 2011 compatibility