[DF-185] Removed magic-code