Modified so as to pass coverage (bug there)