Fix #620 :)