Fix issue # 16