chip bug fixing
Merge branch 'hotfix/chipsbugs'