Possible bug fix

Still testing