Fix hang and return to capture in personal version on activate