Small invoke improvements fix