IDE-798 second fix