Fix for issue with encoding in 14.10+