Bug fixes

- [  ] accepting the change
- [  ] not rejecting the change