fixed and and issue