Made a better dynamic fix