I just found another merge related bug due to this one.. fixing