Fixed 1.8.7 Issues