Lazy attempt at fixing the details.