Merge pull request #2454 from tastywheattasteslikechicken/FixVtableAbort