fixed remove naming clash
1.2.4