bug fix for bugs 1355006, 1354579, 1354581, 1355712, 1354579