Fixed the || issue