IDEA-CR-1302 (dependency fixed)