Fix for feedback from review