Another go at fixing it