Fix #759

@garyb @hdgarrood Could you please review?