Fixed #133
Optimization code