Fix #659 - ?
Minor change for #585