Fix reference error in some cases
Merge branch 'itsisu-dev' into selectmedia