Other small fix to optimizer
Merge branch 'development'