fixed entering problem