calc fix
merged