FIed another pat in utils. Added TODO