Attempt to mitigate issue