#66 Now i can enable this optmization again