Temporary solution