Fixed a bug whereby unsolicited was occuring even if disabled