fixed the problem, orelse instead of andalso