Additional attempt at fixing