Adding hack fix for related nodes validation.