Change fix to be a more robust solution.