fixed bug caused by recent change