Fixed duplicate shelf creation issue.

On some scenario duplicate shelf is creating.