Additional modifications to fix this issue.