Fix a bug and remove one more static cover.