Bugs 2528 and 2582