source nick bug fix