More attribute fixing