fixing merge issue - part 2

(duplicate code !)