Squash the last remaining bug!