Fix for issue #1284.

Fix for issue #1284.