Another fix for comments component