Attempt bug fix