Fix issue introduced by merge