Testing final fix for experimental feature