Fix no room bug