Potential bug fix