Fix: duplicate record problem (NOT FIXED)