Last bug fix hopefully