Fixing last merge issue