Gh 1080

tested this locally, looks good.