Fix entity load on first call