Fix #521.