fix 3.5 declarations