Fix for Patch & Wait