Bug: Solve small bug due to merge