Fix offset for spans