Fixed workspace use