Small fixed a possible user bug/enhancement