replace also for not optimized