Fixed that memory leak... or somethin'