Fix stack copying source and simplify code because we don't need to avoid using stack, as a result