Fixed a tiny bug that worsen performance. Major one remains.