Fix Entry loading