Anti-hangup fix