Gh 1144

tested locally - looks good.