Fixed double form problem