Fixed || issue