Extra fix for media entities