Fixing this issue thing

I feel the issue has been partially fixed