fixed FND-43 and FND-34