Fix bug
Merge branch 'reusable'