Fixed duplicate YSLD handler