Multiple file support fixed