fixed current_order beign nil