Fix for comments update