Fixed bug
Merge pull request #24 from mondora/APP-357

APP-357