V16.1.1, fix for stack and Parser