fix the BUG