Fixed money_amount issues