Even more bug fix