Fixed bug caused by #705