[BUGFIX] Check for existing types before binding