[ORB-502] fixed bugs