fix some buggy bugg