bug fix + add sample