Fixing rss_safe for bolt 1.6