Fixed freezing bug I introduced last commit, but can't fix button stuttering.