10394 final fix