1.8.7 fix?