Minor bug fix

- [x] @be-dmitry 
- [x] @mikeklein13