Fixing merge issue from previous commit