Fix for 1.8.7 having issues with Strings