Fixed a crash and wire names