Fix to be able to make optimized build