WiP: fix the heredoc usage