Fixed for Bug ID 169