Fixed bugs with optional optimization