Bug Fix 2271