Fix from review