Brute Force Fix