Issue 408 comment fix