Supersede PR #689 

- Fix requires the following MP https://code.launchpad.net/~niedbalski/goose/fix-pr-689/+merge/240025 
- This addresses the proposed #689 with a valid test case