Bug fixing!

We got too tricky here.