Closed #149, update warning msg