Fixed #580