Fix issue when doing deploy