Merge pull request #1365 from jpereira/fix/debug-with-yes1