Fixed compilation issue due to incorrect merge