fixed bug
try new method. not working