Fix for table map entries