Trying again with horrible hack.