Fixed Invoke and Yield blocks