fix CTP 2013 issue 8 from #2396
fix issue 9 for 2013 CTP from #2396