Properly handle top-most stack context