removed optimization as it breaks the final build