Fixed issue caused by merging