Bugfix for iso encoding