Fix for dojo module
Improve for log