This bug was more than slightly annoying to fix