Library bug fix