Fix OOS issue with civilian buildings