Modify code to attempt bug fix.