Fix bug
Merge branch 'Refactor' into develop