Feature/fix ion compatibility