Fixed folder removal issue