fix bug
Merge pull request #40 from DiliCMS/feature/v2.3.0

fix bug
Merge pull request #41 from DiliCMS/develop

Fix bug