Added an optimization, discovered weird issue