Found a better way to fix this