First try for fixing building deadlock
Building deadlock should be fixed