Fix completeness as well