some modification
fix