Fixed bug after merging