corrected bug after merge