Fixed galleries part of #239