Index: r-other-mott-happy-2.3/R/happy.R
===================================================================
--- r-other-mott-happy-2.3.orig/R/happy.R
+++ r-other-mott-happy-2.3/R/happy.R
@@ -91,10 +91,12 @@
       for( m in h$markers) {
         add <- hdesign( h, m, model='additive' )
         full <- hdesign( h, m, model='full' )
-	if ( h$use.pedigrees || h$phase.known )
+	if ( (!is.null(h$use.pedigrees)&&h$use.pedigrees) || (!is.null(h$phase.known)&&h$phase.known) ) {
 	 full.asymmetric <- hdesign( h, m, model="full.asymmetric")
-	else
+        }
+	else {
 	 full.asymmetric <- NULL 
+        }
         id <- m
         matrices[[m]] <- list( id=id, additive=add, full=full, full.asymmetric=full.asymmetric )
       }