fixed bug due to last commit