A matter of discipline for Johan Kristoffersson