diff --git a/lib/scripting/objects/vbs-to-wpcemu.spec.ts b/lib/scripting/objects/vbs-to-wpcemu.spec.ts
new file mode 100644
index 00000000..d1b0b612
--- /dev/null
+++ b/lib/scripting/objects/vbs-to-wpcemu.spec.ts
@@ -0,0 +1,100 @@
+/*
+ * VPDB - Virtual Pinball Database
+ * Copyright (C) 2019 freezy <freezy@vpdb.io>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import * as chai from 'chai';
+import { expect } from 'chai';
+import * as sinon from 'sinon';
+import { SinonStub } from 'sinon';
+import { TableBuilder } from '../../../test/table-builder';
+import { Player } from '../../game/player';
+import { Emulator } from '../../emu/wpc-emu';
+
+/* tslint:disable:no-unused-expression no-string-literal */
+chai.use(require('sinon-chai'));
+describe.only('VpmController integration test', () => {
+
+	const sandbox = sinon.createSandbox();
+	let setSwitchInputSpy: SinonStub<[number, boolean?]>;
+	let setDipSwitchByteSpy: SinonStub<[number]>;
+	let getSolenoidSpy: SinonStub<[number]>;
+	let getLampSpy: SinonStub<[number]>;
+
+	beforeEach(() => {
+		setSwitchInputSpy = sandbox.stub(Emulator.prototype, 'setSwitchInput').returns(true);
+		setDipSwitchByteSpy = sandbox.stub(Emulator.prototype, 'setDipSwitchByte');
+		getSolenoidSpy = sandbox.stub(Emulator.prototype, 'getSolenoidState');
+		getLampSpy = sandbox.stub(Emulator.prototype, 'getLampState');
+	});
+
+	afterEach(() => {
+		sandbox.restore();
+	});
+
+	it('VBS should update switch, Controller.Switch()', () => {
+		const scope = {};
+		const vbs = `Dim Controller\nSet Controller = CreateObject("VPinMAME.Controller")\nController.Switch(49) = 0\nController.Switch(51) = 1`;
+		const table = new TableBuilder().withTableScript(vbs).build('Table1');
+		new Player(table).init(scope);
+
+		expect(setSwitchInputSpy.args.length).to.equal(2);
+		expect(setSwitchInputSpy.args[0]).to.deep.equal([ 49, false ]);
+		expect(setSwitchInputSpy.args[1]).to.deep.equal([ 51, true ]);
+	});
+
+	it.skip('VBS should update language setting, Controller.DIP()', () => {
+		const scope = {};
+		const vbs = `Dim Controller\nSet Controller = CreateObject("VPinMAME.Controller")\nController.DIP(0) = &H00`;
+		const table = new TableBuilder().withTableScript(vbs).build('Table1');
+		new Player(table).init(scope);
+
+		expect(setDipSwitchByteSpy.args.length).to.equal(1);
+		expect(setDipSwitchByteSpy.args[0]).to.deep.equal([ 0 ]);
+	});
+
+	it('VBS should update language setting, Controller.Dip()', () => {
+		const scope = {};
+		const vbs = `Dim Controller\nSet Controller = CreateObject("VPinMAME.Controller")\nController.Dip(0) = &H70`;
+		const table = new TableBuilder().withTableScript(vbs).build('Table1');
+		new Player(table).init(scope);
+
+		expect(setDipSwitchByteSpy.args.length).to.equal(1);
+		expect(setDipSwitchByteSpy.args[0]).to.deep.equal([ 112 ]);
+	});
+
+	it('VBS should read solenoid, Controller.Solenoid()', () => {
+		const scope = {};
+		const vbs = `Dim Controller\nSet Controller = CreateObject("VPinMAME.Controller")\nController.Solenoid(4)`;
+		const table = new TableBuilder().withTableScript(vbs).build('Table1');
+		new Player(table).init(scope);
+
+		expect(getSolenoidSpy.args.length).to.equal(1);
+		expect(getSolenoidSpy.args[0]).to.deep.equal([ 4 ]);
+	});
+
+	it('VBS should read lamp, Controller.Lamp()', () => {
+		const scope = {};
+		const vbs = `Dim Controller\nSet Controller = CreateObject("VPinMAME.Controller")\nController.Lamp(3)`;
+		const table = new TableBuilder().withTableScript(vbs).build('Table1');
+		new Player(table).init(scope);
+
+		expect(getLampSpy.args.length).to.equal(1);
+		expect(getLampSpy.args[0]).to.deep.equal([ 3 ]);
+	});
+
+});
diff --git a/lib/scripting/objects/vpm-controller.ts b/lib/scripting/objects/vpm-controller.ts
index f7171d01..cd123f6f 100644
--- a/lib/scripting/objects/vpm-controller.ts
+++ b/lib/scripting/objects/vpm-controller.ts
@@ -284,9 +284,9 @@ export class VpmController {
 			setFunction: (prop: number, value: number) => boolean,
 		): { [index: number]: number } {
 		const handler = {
-			get: (target: {[ index: number ]: number}, prop: number): number => {
+			get: (target: {[ index: number ]: number}, prop: number | string): number => {
 				logger().debug('GET', name, {target, prop});
-				return getFunction(prop);
+				return getFunction(parseInt(prop.toString(), 10));
 			},
 
 			set: (target: {[ index: number ]: number}, prop: number | string, value: number): boolean => {