fix my "optimization"