Add a FIXME.
Add a workaround for issue #1463.