Fix possible bug