Fixing the issue that was crashing the system
Merge branch 'dev' of github.com:DarussalamTech/dtech-mob into dev