Fix disappearing Story
Ready for Prod