Fixes an issue after merging