Fixed unwrapping issue when using different providers
Fixed ISSUE #50 - some commands not wrapped properly