Fixed as per PR