MODE-2231: Fix for comments