Fix to work in labs