Hopefully fixed http://pastie.org/5663358