Updated PR with this change and the `//#` fix