Got the stack being passed to the front-end.OF
Merge fix