fixing thread issue on 1.8.7