Hotfix/resque