Another try at a workaround.