#808 - fixing big table issue