fixed possible bug (2)