Fix for some cases of stuck ligstic building and owners building