1.8.5-dev, optimization has been fixed