QA step 1 - bug fixing 2014_8_13