Fixed grabby InvokeCommand implementation