fixes on 7 years