Fixing call stack manipulation