Hotfix/support delay