Hotfix: 0.0.1.36

A little improvement in the optimization;