Fix for floating tag issue