Fix/compatibility indigo