Added additional check in case file already exists