Bug fix and accepting files