should fix object deletion