Fixed issue in the entity interpolation.