workspace ordering fix