Fixes Error in 1.8.7