Hotfix for failure on user