New optimization; fix <4 elems bug
Fix a nasty bug