Fixes for use-case 6
Fixes for use-case 07