fixed possible bug (3)