Fix this use case
Fix this use case