fixed broken order for callback