Overlap and add bug fixed!