Suspension hotfix