Fix iain/roundsman#26