@ better way to fix some warning