1K-161 works/fixed stack issues