Fix #529