additional changes for 1.8.6 compatibility