Fix logic for garage