Initial fix for OPENIG-230