#51 #50 Fix.  #51 is fixed