Some Fix..