Final (?) fix courtesy of Scott Miles