Fixed bug introduced by table.remove.. we'll have to reopen #19