Resolved patch issue after merging