Entities fixed.