One last button fix, I swear