changed the way i fix the issue #34