Fixed: duplicated code due to merge