Fixing bugs with new attributes