#8 broken tabs, fix without breaking in 5.x versions