Fix for Signal Buses and Terminals.