temporary hack for our use