Playing with Fire and closing #520