Fix for encoding again