Fixing base64 encode and decode