Bug/consistency fix