workspace ordering fixed