Remedying 2.6 problem