Attempt at fixing things