Make it possible to use 4.1