Solved second use case of bug #890822 bug/890822

Change-Id: If8ac4dd7540400b38a65fcb0419beab70ff55029