Fix for accidental variable duplication