Fix bug # 65