Fixes issue #1741 by moving the comments in the root element