Fix some buggy