Fixed** Stack Error and logic