Fix #588