bug fix! solution B