To be reverted, fix files stuck modified