Fix for jmp to function issues