First attempt at fixing the gap tags.