Fixing what I broke again