Fix #533.