Gh 1254

tested this locally - worksforme.