BUG: Make more robust and don't fail if already exists