still trying to figure out 1.8.7 support