Fixed bugs in original apple tables .... :-)