Corrected issue after merge