custom & route callbacks bug fix