I Over-Engineered a fix to the most annoying thing