[S2014] Fixed bugs