Another attempt at fixing