[FIX] Magic values removed