Fixed fileName parsing