fix from Viv/Fraser