Temporary fix for tabs issue