Yet another optimizations