Fixed bug caused by merging fork