Actually Fix The Bug(tm)