Added a temporary hack.