bring back 1.8.7 compatibility