Fixed yrds input issue