fix this bugs:
629 - 634 
reported in redmine