This hack should speed things up a little.