Corrected problem added during the merge