Fix Bug # 981