minhnguyen - Fix after creating new entity