added horrible kludge back in for the sake of maintaining existing behaviour.