Table fix for issue 809