fixed issue with duplicate drawer