minor bug fix on component behaviour