Fixed OS/stack interaction