Update for issue #1527