Changed so that works in 2.4.1