fixed or and and issue