complete reset to nil bug fix