Temporary solution for temporary problem