Added fix for review comment