Fixes tag support with wrap:false