Fixed old || vs && logic