Final Gallery fix!