wrong code for optimizer patch
Merge branch 'development'
Small fix for optimizer