nasty fix for resolve preceding notify