Fix duplicate code due to merge