Remove logic that could be causing mass issues
Fixed "issue" that cause a massive mistake on my end