Changes to prevent feed stream from breaking