Fixed loaded detection (again)