Adding iOS workaround