Issues/2819 misplaced comments

Fixes #2819 

cc @sendhil