PMG - resolve entities's bug