Fixed issue: Removed restrictions on encoding