Remove a nasty bug inserted through refactoring
Remove a nasty bug inserted through refactoring

bculkin2442/ioke,bculkin2442/ioke,olabini/ioke,bculkin2442/ioke,olabini/ioke,olabini/ioke,bculkin2442/ioke,olabini/ioke,bculkin2442/ioke,olabini/ioke,olabini/ioke,bculkin2442/ioke,bculkin2442/ioke