Fixed bug for NULL source values