Idfix for #449