Update from John's fix

Bugs bugs bugs.