Overflow fix by using tables