fixed compilation after merge