Bug/fix merge issue