ordering fix for entries