Fix #580