fixing possible bug