Fixing activity closure - preliminary