Fix STK

Change-Id: I17b562d5817581e8a7c1407cdad411c8eeafd865