Bug #951 final fix