attempting to fix 1.8.7 issue