fixed freeze and boundaries