Added workaround for ECB