Add a workaround for issue #1463.