Another bug fixed
Merge branch 'development'