Fixes: #2859 Adding comment modifier