Another attempt at fixing deployment