fixing optimized builds