Fixed merge #20