Attempt at a bug fix