Fixes double encoding issue presented with the 0.8.7 release