added compatability with 1.8.7