Hopefully a bug fix