Minor correction after optimizations