Fix constaint conflict