Fix the same issue as the previous commit but in another location