Added check for already hitched