Fixed as per GH feedback