stack size fix
merge