Fixed as per Troy's CR