Change last should

This is a follow on from #373.