Fixed how objects are disposed. Reset added