Resolved duplication on drawers