Fixed the issue with the current unit after creating a new one