v6.21 bug