more pre 1.8.9 handling