minhnguyen - fix Entity