Gallery Class Fix