Add a FIXME.
Add a workaround for issue #1463.
Merge pull request #1469 from 23Skidoo/issue-1463

Add a workaround for issue #1463.