fix for entity table