Alter fix for issue #1257
6 files changed