comment change, remove buffer protection not needed anymore