Fixed bug when merging with david
Fixed bug when merging with david