fixed issue with non supported components