keep code still 1.8.7 compatible - for the time being