Fixed for Bug ID 176