fixing a possible bug