Fix #682

#682