JOJ-32 Fix after merge