Fix bug from merge
(#342)