Fix bug in workaround. Gah.