Fix/pim compatibility