Fixing to allow multiple executions/process.