Fixed problem due to merge