bug fix, now is workable