Bug Fix 2486 and 2530