Fix from comments