Insert Rich Family Name: Fix bugs

Fix bugs