#1287 GeoffAshby