Fix for IMS refactoring