Fixed bug # 11.