Trying to fix this
Finish Hotfix-1.3.6