Fixed Drop and Exchange commands !