hack fix for embedded record issue