Fix #1 by recoding the whole thing