Fix  #415.
Fix #417