Comment field fix