Fixed ganjafarma
Revert "Fixed ganjafarma"

This reverts commit f75ec43fc6f0df7224ed2e5b28f54a9ebfe51fc4.
Revert "Revert "Fixed ganjafarma""

This reverts commit 3dc77d050eb37aa9605ae86829a7b704b8cffd66.