validSource check fix