Canceling Story fix
Merge branch 'canceling_story_fix' into admin