9f477129e2
Fixes a bug which happened during workspace creation and remove duplicated code
Fixes a bug which happened during workspace creation and remove duplicated code