Solved Bug from Merge