Adding minor enhancement