-fixed broken association