merge fix to nil stories. from main repo