[WARNING] fix nullable in entities