FIX: Gallery

Ready for review/merge.
Out of curiousity, why copy?