Try to fix attributes not being set correctly