fix bug
Merge remote-tracking branch 'gallery/master'