Fix for issue #1264