Fixed issue with disposable setting