Fixed issue # 35.