bug fix for norh source.