Additional hackery.