[1.8.7] Fix