Fix untested code.