+ fixed a bug that caused switch addesses with leading zeros to throw an exception