fix buggy