bounds fixing v2