fixed & issue