fixed for new component version
fixed conflict.