Fix after merge for Ivanna branch