Fix #616