Fixed not-working causing bug in 2.4