Fix wire handler bug