fixes: by 2 commits from local