Bug fix
Merge branch 'hotfixes'

* hotfixes:
  Bug fix