Fix  master 2.1 photo changes