Make martin happy