Should solve activity stack problem. fixes #1