Alternative refs #32

Undo of 1st try and move handling to the caller