Fix untested code