optimizations
fix