Fix #626
Fix  #613