Will this be fixed in 4.1?