A preventive fix

 - Preventive fix to avoid target property name colision