Fixed a really, really stupid bug. Note, it's very hacky.