fixed before final