Fix for review commnets