Fixed what could be considered as a duplication bug.

This is a must-have fix.