fix issue#1 WTG!