Record creation fix