Unfixed the replace component fix, because it created new problems.
Unfixed the replace component fix, because it created new problems.

Hopsan/hopsan,Hopsan/hopsan,Hopsan/hopsan,Hopsan/hopsan,Hopsan/hopsan,Hopsan/hopsan