Temporary fix for the weird table issue