latest Adriaan's changes to sammy broke it. reverting to 5b83d0d47b