Fix AmountField when initial amount is None