Fix for review - 2039