Enabled optimization.Solves issue #8