Fix #591