Bug fix for Record form save