Fix #609