Fixing free members issue