fixed bugs with case 1403