Argh, another bug fix