trying to fix 1.8.7
still trying to figure out 1.8.7 support
fixing another 1.8.7 bug.