internal components bugfix