Fix #608