fixed stack_track
merge