Fixed JB's mess --Andrew