Neil's update #2 - resolving #1258