There were bugs in my bug fix...