fixed spray conflicts