Self-deadlocks improved