Fix #437 #435

Change done.