fixes #41 (again - need to merge in condition rather than set to is not null)