Fix: Comments adding issue

Fix: Comments adding issue