fixes OOP and disposables this is a past 48 update.