Avoid the first form - #380