Fixed workspace issue