cleaned up row context weirdness in mom path