fix to order of triggering