Better way to fix this issue.