fixed for component also