Fix issue # 131