Temporary hack