Fixed dead-lock situation