another fix regarding last commit