Fix of bugs:  #429 and  #430