Add 1 bug and 1 feature request