Finish subscription start option, fixes #37