fixed: big bug