replaced magic-nr with instance var.