Fixed issue #79 (Optimization Problem/Bug)