Fix bug, add sample