Bug fix on workspace update