Fix #19 merge error