Fix error from merge
(#364)