Fix for comments from PR